cssselector: Support :not() for position pseudoclasses
authorBenjamin Otte <otte@redhat.com>
Mon, 8 Dec 2014 04:42:11 +0000 (05:42 +0100)
committerBenjamin Otte <otte@redhat.com>
Wed, 10 Dec 2014 02:49:40 +0000 (03:49 +0100)
This is simple now that the latest commit used the macro and
autogenerates the SelectorClass to use.

gtk/gtkcssselector.c

index ee1a0deef01ecfd9a4049c00333c8787cc39092c..c3d8afba6361b2b07d5b1b26b825b86d6e2f50f9 100644 (file)
@@ -1536,14 +1536,6 @@ parse_selector_pseudo_class_nth_child (GtkCssParser   *parser,
 {
   int a, b;
 
-  if (negate)
-    {
-      _gtk_css_parser_error (parser, "position pseudoclases not yet supported for :not()");
-      if (selector)
-        _gtk_css_selector_free (selector);
-      return NULL;
-    }
-
   if (!_gtk_css_parser_try (parser, "(", TRUE))
     {
       _gtk_css_parser_error (parser, "Missing opening bracket for pseudo-class");
@@ -1648,7 +1640,8 @@ parse_selector_pseudo_class_nth_child (GtkCssParser   *parser,
       return NULL;
     }
 
-  selector = gtk_css_selector_new (&GTK_CSS_SELECTOR_PSEUDOCLASS_POSITION,
+  selector = gtk_css_selector_new (negate ? &GTK_CSS_SELECTOR_NOT_PSEUDOCLASS_POSITION
+                                          : &GTK_CSS_SELECTOR_PSEUDOCLASS_POSITION,
                                    selector);
   selector->position.type = type;
   selector->position.a = a;
@@ -1731,16 +1724,10 @@ parse_selector_pseudo_class (GtkCssParser   *parser,
                                                selector);
               selector->state.state = pseudo_classes[i].state_flag;
             }
-          else if (negate)
-            {
-              _gtk_css_parser_error (parser, "position pseudoclases not yet supported for :not()");
-              if (selector)
-                _gtk_css_selector_free (selector);
-              return NULL;
-            }
           else
             {
-              selector = gtk_css_selector_new (&GTK_CSS_SELECTOR_PSEUDOCLASS_POSITION,
+              selector = gtk_css_selector_new (negate ? &GTK_CSS_SELECTOR_NOT_PSEUDOCLASS_POSITION
+                                                      : &GTK_CSS_SELECTOR_PSEUDOCLASS_POSITION,
                                                selector);
               selector->position.type = pseudo_classes[i].position_type;
               selector->position.a = pseudo_classes[i].position_a;